Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev am: 77ee4f2ff2
am: 8916db215f

Change-Id: Ie7fc5c28a0a6de7309f065a3b001bdd8190fa95e