Merge "Add more checks for location access"
am: 26013dca1b

Change-Id: I585f19a79f3b831b535f7f6af881384106dc0783