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