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