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

Change-Id: Ida1e3dc5a50913808f7482f3993bcd5dc0ffeb27