Merge "Fix some location issues exposed by CTS." into jb-mr1-dev