Fix workflow state updating correctly

Follow-up to Id9ddb63, originally broken by yours truly in I097414e

Bug: 62957
Change-Id: I888c24213a35a24b27fb48eeb43d5aa6adf024a1
Comment fix: Singular form more common

Partially follows-up I16272de

Change-Id: I43cfa6cbc9c0420882630026b709ed5c4903b02a
Merge "Comment fix: Singular form more common"
Merge "Fix workflow state updating correctly"