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

Change-Id: I5b8f59e5d55914960545dbc55b9087a4410f8987