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

Change-Id: Ibb2f1dd5e007a78ab77dab21f086749df3a5a9cf