Merge "Revamp USB tethering startup flow." am: 90fddefd5e
am: 375c0a55d8

Change-Id: Ied9a69a24126aab0aae131816fb6bf605e704554