Merge "Send broadcast when location mode is about to change DO NOT MERGE" am:...
Merge "Send broadcast when location mode is about to change DO NOT MERGE" am: a524e7d8 -s ours am: 120f85a5
am: 5401c949 -s ours
Change-Id: I5976a11d9d302dd03567f2b8facf2afdf785b2ea