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

Change-Id: Ib97830e241c2e0e3d5561220166a8bf9798a1238