am 11852804: am 96b24f58: (-s ours) Merge "DO NOT MERGE Relax LocationVerifier...
am 11852804: am 96b24f58: (-s ours) Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev
* commit '11852804':
DO NOT MERGE Relax LocationVerifier assertions.