Merge "Add a timeout in waiting state to unblock the state machine after 30s."
am: 1ef77a5070

Change-Id: I4202b2b45770b230daf0f910f4f90b4c1e513cef