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