Merge "Refactored cell broadcast area info support" am: c36cc4e120

Change-Id: Ib1648fc64bc12d11b889468cd6a6c5c4ff09f0c2