Refactored cell broadcast area info support am: 0553853678 am: a22e77d2b4

Change-Id: I74fa0361e6b58281d9f47e8e68972f293766e6eb