Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am: be7657b0" into oc-dr1-dev