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

Change-Id: I0dad59573050cba4ee98bf5d15a7c85931b9199f