AI 146222: Manual merge of 145980 from donutburger => master.

Automated import of CL 146222
4 files changed