am ba52b3e0: Merge change 21149 into donut

Merge commit 'ba52b3e08b33592457242944f7a89691a5b94880' into eclair

* commit 'ba52b3e08b33592457242944f7a89691a5b94880':
  DOCS ONLY.