Snap for 8736029 from 35f68506d29b8031ac98bdaf89fd6a22c83f9192 to mainline-go-cellbroadcast-release

Change-Id: I115f5b21d433f05f773d58b6154fb49c2032aebd