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

* commit 'fe664ce3d2b2e7292f7a6aef2be6eb2fdc343d56':
  Fix state transition verification.