am 5bc61e23: Update to follow internal API changes.

* commit '5bc61e23008567a9d934848359439d8936aa3482':
  Update to follow internal API changes.