auto import from //branches/cupcake/...@132276
12 files changed