am 6bed599a: Merge "Fix state transition verification."

* commit '6bed599aa7395f7a78bf7d74e3ec40c5b234909b':
  Fix state transition verification.