Merge "Replace ConnectivityManager as TetheringManager"