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