am 12c90b05: am aa5e25d2: Re-run update-api to fix the build.

Merge commit '12c90b0525d8e97a2fae060f95e9761c0c48c26d'

* commit '12c90b0525d8e97a2fae060f95e9761c0c48c26d':
  Re-run update-api to fix the build.