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