[automerger skipped] Merge "Handle cell broadcasts with new module" am:...
[automerger skipped] Merge "Handle cell broadcasts with new module" am: 66b9984d am: af014b5d am: e68779e9
am: 5478ef9f -s ours
am skip reason: change_id I5b17e3ea010bab788b26f4c08539a33f38cbb20e with SHA1 6320dfc2 is in history
Change-Id: I4d4e6d1130b6d2d10efca4a63ed07098190bb22c