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

Merge commit 'fc82f6b562c0643fcda6b8947fbf45c48efa3165'

* commit 'fc82f6b562c0643fcda6b8947fbf45c48efa3165':
  docs only.