am 22a10202: Merge change 8556 into donut

Merge commit '22a102022c51920204bce4e4f1caded5e1f3ce6f'

* commit '22a102022c51920204bce4e4f1caded5e1f3ce6f':
  AI 150264: DO NOT MERGE TO DONUT.