Merge "DO NOT MERGE Fix LocationManagerTest#testExitProximity" into jb-dev