Merge "Properly upgrade LOCATION_MODE"