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