am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

* commit '1b007565c73097728496f3dbe811a51c879ba89e':
  Fix state transition verification.