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

Change-Id: I5b96699f2368c18cfbef004c006019fe4cdcecf0