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