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

Change-Id: I393817fac7402d51fbd8dfd1fda20d16b398de17