AI 143391: Merge from donut Change 143255

Automated import of CL 143391
3 files changed