Merge "Fix StateMachine init/quit race." am: 5c7de22a06 am: 1ef2e98a14
am: 7f404200e0  -s ours

Change-Id: I19eaca9acea75f3d9c4f8aad96f205063db24e0c