Merge "Fixed CTS failure due to selecting wrong transition." into oc-dev