am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1

* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
  Reduce likelihood of crash in state machine.