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