Merge "CtsTransitionTestCases: increase timeout" into oc-mr1-dev am: 3714dc25e3
am: 626b03748a

Change-Id: I06105a24d58f5b9fa22d97052ce4657ab8547624