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