am c59bac1a: am 1b856974: Merge change 22822 into eclair

Merge commit 'c59bac1a2a9cded00ccd9f456ec065e6a9dc6055'

* commit 'c59bac1a2a9cded00ccd9f456ec065e6a9dc6055':
  docs only.