am 1b856974: Merge change 22822 into eclair

Merge commit '1b856974617cb88202cdfe28bdcf43a939fa47be' into eclair-plus-aosp

* commit '1b856974617cb88202cdfe28bdcf43a939fa47be':
  docs only.