am e808a4b6: Update after API refactoring.

* commit 'e808a4b6b25b9012e2a7d35d178bc37701cae8b8':
  Update after API refactoring.