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