am 5c6fee52: am 40f3271c: More doc changes.

Merge commit '5c6fee520e29bcd589b5ab310194ca9773332eba'

* commit '5c6fee520e29bcd589b5ab310194ca9773332eba':
  More doc changes.