Snap for 8748865 from 5409851f438e90beee996d4f68a0d2408c7c4414 to tm-frc-cellbroadcast-release

Change-Id: Ic02f07dcb3aabbc3a79d6b5494271a6507e950d3