Merge "Add fileds to Cellbroadcast"
am: 071936e546

Change-Id: Iad7a4cd63161e8634a4431ad6536f75b7a7ee82c