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

Change-Id: Ice50525982315b37787b9da9ae8f38a8aac62229