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