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

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