AI 146736: am: CL 146674 "Target" nomenclature fixes
  Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 146736
3 files changed