Merge "Modify StateTransitions test" into oc-mr1-dev