Merge changes from topic "cellbroadcastintents"
am: 6bcc4db8c0

Change-Id: Idd0a6a63731f996573f51e3343c3165d692d1adc