Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev am: 684b056531 am: 73e3d9f58c
am: b06514ecf0

Change-Id: I9a50ecc98ff6a26e073af3ba63a3cfd79a3bedb2