am c21929c7: Merge "Fix doc build"

* commit 'c21929c710949a48790fa2701c47cedfabb7b9dc':
  Fix doc build