auto import from //branches/cupcake/...@130745