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

Change-Id: I36cca56eb93767d23f2d08b708208ba8ff1db06d