am 9262e703: Merge "Fix ApiDemo for transitions" into klp-dev

* commit '9262e7037fdaefbcde9d225b51af4bc980e69fcd':
  Fix ApiDemo for transitions