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