Snap for 8684859 from ae2837d80cfc64ae0c5a12737d4b480a479adb20 to tm-frc-cellbroadcast-release

Change-Id: Ia4ac361326ee3d9c24dce47b652edc11bbfb8e35