am d0eef01b: (-s ours) am db5ce5e1: Merge "DO NOT MERGE Fix LocationManagerTest#testExitProximity" into jb-dev * commit 'd0eef01b': DO NOT MERGE Fix LocationManagerTest#testExitProximity