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