Merge "DO NOT MERGE Relax LocationVerifier assertions." into jb-dev