AI 145858: am: CL 145559 Cleanup for early-look SDK.
  Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 145858
7 files changed