Merge "Fixed CTS failure due to selecting wrong transition." into oc-dev
am: 7b7e7e1603

Change-Id: I3fe14c8bf7316b97135dc01286c329deb806824b