AI 145380: Fixes for add-on build

Automated import of CL 145380
1 file changed