Merge "Simple cleanups to Tethering" am: 7eaa2ad172
am: 921c40c0ce

Change-Id: I95b614848060fc2b43f646dbe64409d3cd6fd04e