auto import from //branches/cupcake_rel/...@140373
16 files changed