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