2dcaf4ee66
Original author: enf Merged from: //branches/cupcake/... Automated import of CL 145493
Original author: enf Merged from: //branches/cupcake/... Automated import of CL 145493