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

* commit '11852804a77c7eda1d087100d17c24645708a106':
  DO NOT MERGE Relax LocationVerifier assertions.