auto import from //branches/cupcake/...@126645
15 files changed