am f99fc540: (-s ours) am 34f930f3: Fix build due to docs bug. DO NOT MERGE

* commit 'f99fc5405ea909e8fdea3446646afd8b26229c18':
  Fix build due to docs bug. DO NOT MERGE