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

Change-Id: I0e00187f9a5eee9e55f961ce0458c9b91af19fb7