Merge "Fix Transition test failure." into oc-mr1-dev