Fix USB tether

Change-Id: I10b19d4fb86fe477655af369726bc26ba301c0f4
Merge branch 'cm' into HEAD