Snap for 8512216 from 81c07084cca2a6feab53eeb022f5d5a3ab5c10c5 to tm-frc-cellbroadcast-release

Change-Id: Idd19cf207cd91af2d0431d161bbb306886a49c28