Merge "Update location permission strings" into rvc-dev