Merge "LocationAccessQuery builder changes and tests"