am 0d5aad7e: Update to follow API.

* commit '0d5aad7edbed3ed5c13904cc13ec8842ffe8837b':
  Update to follow API.