baf49ae7d0
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 145858
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 145858