am d2fe6628: am e808a4b6: Update after API refactoring.

* commit 'd2fe662835dba21d50a1d6310abcfb9dd816604d':
  Update after API refactoring.