AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
39 files changed