Merge "Modify StateTransitions test" into oc-mr1-dev
am: 51b64c30c7

Change-Id: Ia6fb6cfc3c3dc0f397db59236b75aed29660f8ab