Snap for 8745897 from d198b5a5144605555505e4336306f10eebe0db4f to tm-frc-cellbroadcast-release

Change-Id: I45e6e028d9abc3cf2df2a46fda939286e26bd855