[automerger skipped] Merge "Corrects broadcast area for geo-fencing trigger...
[automerger skipped] Merge "Corrects broadcast area for geo-fencing trigger message" am: 22b5f9d1 am: 65387132
am: 9177c022 -s ours
am skip reason: change_id I742990eb6f00472c94b4afab8a74a5e113d235a7 with SHA1 7be2041d is in history
Change-Id: Ic80d7d18c83aa0f1ef5590bca1c23520827e6586