Snap for 8358640 from ee86670715b2f28028e6c270e07dcbd56882c5ec to mainline-go-cellbroadcast-release

Change-Id: I3e44140424ce1e5b5db04868109ea25fe8aedf15