am 0d9a6278: Fix api change following a rebase.

Merge commit '0d9a6278b47f994d5f9556e13e7fd7887a87228b'

* commit '0d9a6278b47f994d5f9556e13e7fd7887a87228b':
  Fix api change following a rebase.