am 0da1a301: am 8f76734d: Fix docs breakage.

Merge commit '0da1a301dcb4c3a3ad01aadc89f25ccbfd8835bd'

* commit '0da1a301dcb4c3a3ad01aadc89f25ccbfd8835bd':
  Fix docs breakage.