am 63c4244a: am aab72e7c: am 4d484a82: Merge change 24700 into donut

Merge commit '63c4244a1280cc93c9ac442df5100f2dfea2d80f'

* commit '63c4244a1280cc93c9ac442df5100f2dfea2d80f':
  docs only.