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