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