am 2273a31d: am ea1241f0: Merge change 26244 into eclair

Merge commit '2273a31d9b42cb2a31f629e9d6ad559512b290a2'

* commit '2273a31d9b42cb2a31f629e9d6ad559512b290a2':
  docs only.