Code drop from //branches/cupcake/...@124589
279 files changed