Merge "Remove LOCATION_GLOBAL_KILL_SWITCH completely"