am 185d74ba: Merge change 21977 into donut

Merge commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788' into eclair

* commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788':
  docs only.