[coastguard skipped] Merge sparse cherrypicks from sparse-11275145-L20400030001528572 into mainline-cellbroadcast-release.

COASTGUARD_SKIP: If0145e46b747904b3af8a23d86659810db8b57c5
COASTGUARD_SKIP: I386ccf877be08cb9c7104798f7dd5a4a6ebc356a

Change-Id: I03ee651204d940ed40d150cfcdbd5f7546c8683e