am 4dc826b7: am 389cdb7a: Merge change 26258 into eclair

Merge commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7'

* commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7':
  docs only.