auto import from //branches/cupcake/...@130745
50 files changed