AI 143172: am: CL 142875 [1732012] for some reason these files didn't go through in the preview check-in.
  Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143172
2 files changed