Automated import from //branches/cupcake/...@142649,142649
12 files changed