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

Change-Id: I58e6cf60e0e7448c96752b99aa25cb5ad88a09b6