5ed91c8170
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 147083
Original author: ddougherty Merged from: //branches/cupcake/... Automated import of CL 147083