am 4d484a82: Merge change 24700 into donut

Merge commit '4d484a823d336ea587e37508fe73178d711dcdca' into eclair

* commit '4d484a823d336ea587e37508fe73178d711dcdca':
  docs only.