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

Change-Id: Ifb9903a985090e85d85e642bd3e6d5a1d68b6bfb