Merge "Clean up class members in Tethering.TetherInterfaceSM"