auto import from //branches/cupcake/...@132569
52 files changed