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