Merge "Fix NoLocationPermissionTest"