Merge "WifiStateMachineTest: remove looper race" into oc-mr1-dev