am e06d28ec: am dab571d6: Merge change 22524 into donut

Merge commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a'

* commit 'e06d28ecd7df35d9ab978edbf93129a0f1ad610a':
  docs only.