am 890175db: Merge change 24574 into donut

Merge commit '890175db1f425cb92365cc7941c6c64544b2c164' into eclair

* commit '890175db1f425cb92365cc7941c6c64544b2c164':
  docs only.