79ad626231
Original author: brettchabot Merged from: //branches/cupcake/... Automated import of CL 144098
Original author: brettchabot Merged from: //branches/cupcake/... Automated import of CL 144098