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