Merge "Add ACCESS_FINE_LOCATION to permissions"