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

* commit '454fc6b1189225c54a833053f6aed32508f42f3e':
  Fix state transition verification.