Merge "Use LOCATION_MODE to control location"