am b4a9859d: (-s ours) am db83ff3d: DO NOT MERGE Relax LocationVerifier assertions.

* commit 'b4a9859dd77c015d9dbfe9cd4e9ee1f569b64033':
  DO NOT MERGE Relax LocationVerifier assertions.