Merge "Fix StateMachine init/quit race."
am: 5c7de22a06

Change-Id: I26ab138d66366efbcc515e5da0ed21de3e90fa9a