2fd2f6e5c6
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 146345
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 146345