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

Change-Id: I45998443af811bdf43b84c4ff6efd14b5deee40a