AI 143296: Merge from donut Change 143147

Automated import of CL 143296
9 files changed