AI 144080: No need to merge. Fix the build.

Automated import of CL 144080
2 files changed