dc52312ce3
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 146610
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 146610