Merge "Implement more location checks" am: a3aae9fe4b am: 8b98155789
am: 74c000a5ba

Change-Id: I3a75d4497453eb8284929e420f933332c792ef83