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

Change-Id: I5ae4bde02a4ee2a6d053529ebed0b6aa3dc596c5