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