Refactored cell broadcast area info support am: 324ca000ac am: f7d161816c

Change-Id: I0217794d97a0ba1d40e74c1005c57525dd4ee67d