Merge "Add a timeout in waiting state to unblock the state machine after 30s."...
Merge "Add a timeout in waiting state to unblock the state machine after 30s." into oc-mr1-dev am: 10453eb7
am: 607d4fb2
Change-Id: I7402563d12e2c3e56942d2f500073f3e95976763