Original author: xav Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147295