Merge "Rename TetherInterfaceSM to TetherInterfaceStateMachine"