AI 146674: "Target" nomenclature fixes
  BUG=1795612

Automated import of CL 146674
3 files changed