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

Change-Id: I77816bf56dedac6127301dc7ffd1f1de3e91031d