Merge "TetheringConfiguration: force to select upstream automatically on U+"