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