AI 145622: am: CL 145380 Fixes for add-on build
  Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 145622
1 file changed