Merge "Some cleanups for Tethering"
am: 31b33b6f41

Change-Id: Ifb60c76855a2bea5a1cccf26034e6c582ad16021