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

Change-Id: Ic1ce05e5aab661de9fd461819c9b98f81ffa8763