Merge "Add fileds to Cellbroadcast" am: 071936e546 am: e5f84f5a70
am: 33f79cdfc2

Change-Id: I8f38d93f964ed8beea5365330e6749337b77a84c