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

Change-Id: I477af430f9b3ccb2324a8ba6a09c4739c2945f5d