Refactored cell broadcast area info support am: 324ca000ac

Change-Id: I8ce09ac180b34b97da63bede48ecd28f621dee2e