Merge "Getting rid of LOCATION permission usage"