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