Merge "Update location permission strings"