am 728157b4: Merge change 23242 into donut

Merge commit '728157b4af937bc34706b71c21e9d804ca83039d' into eclair

* commit '728157b4af937bc34706b71c21e9d804ca83039d':
  docs only.