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

* commit '560e75417252b502a41967aa4d819a029361e384':
  Fix state transition verification.