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

Change-Id: I4812df215e086f96b05f39d0e087c88d7f43c526