[automerger skipped] Merge "Added slot index in area info broadcast" am:...
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2c am: d1cd033f -s ours am: e3d56edd -s ours am: 73a4b1db -s ours
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcb is in history
Change-Id: I7019b8d391688f96fceebba052ca34367cb981d4