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