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