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

* commit '96b24f5829ac87c32d4e95628cfab4234cb27cfc':
  DO NOT MERGE Relax LocationVerifier assertions.