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