Merge "Implement more location checks"
am: a3aae9fe4b

Change-Id: Ia72a3fba1718a6e021b549fce92f096c3d7f0c9b