auto import from //branches/cupcake_rel/...@138607
103 files changed