Automated import from //branches/cupcake/...@142098,142098
24 files changed