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

Change-Id: I4cebde819520bba1877a04e773ff128ca37a0af5