am 8db3bd6e: am 9ae00645: Merge change 26280 into eclair

Merge commit '8db3bd6ec5e242d05488c2c175c90d6b5d535a43'

* commit '8db3bd6ec5e242d05488c2c175c90d6b5d535a43':
  Another doc update.