am 1cb87dac: am 4f410fb5: Update to follow API.

Merge commit '1cb87dac3363386295e1483053563aff2e1ac989'

* commit '1cb87dac3363386295e1483053563aff2e1ac989':
  Update to follow API.