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