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