am 3e21bf47: am 96b7f921: Merge change 23565 into donut

Merge commit '3e21bf473a89688918f4e59fac4ba2d4539e3775' into eclair-plus-aosp

* commit '3e21bf473a89688918f4e59fac4ba2d4539e3775':
  docs only.