Merge changes from topic "cellbroadcastintents" am: 6bcc4db8c0 am: e0c19be377

Change-Id: I04714fdbe41eeaeb845d7adfb2228a7814447d6e