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

Change-Id: I95a10d6b47feba64ba7ef6b7b24606dd1ecc5892