Merge "Revamp USB tethering startup flow."