Merge "Some cleanups for Tethering" am: 31b33b6f41 am: 5dff3c98c5
am: 9d4a2a27e6

Change-Id: I0f5c8f33f13dfa2366992a2b2e0ada7667b90e2f