Merge "Tethering: remove redundant source code" am: 7f9b3ca809 am: 69c72da2c7

Change-Id: I454f1021bc2a03853f6bc228c805aba99481eb19