Merge "Send broadcast when location mode is about to change DO NOT MERGE" am: a524e7d87d -s ours
am: 120f85a516
Change-Id: I00d764427db65fd2dcc8a93846cbe825a91b33ac
This commit is contained in: