c026e8ef0b
Original author: enf Merged from: //branches/cupcake/... Automated import of CL 143685
Original author: enf Merged from: //branches/cupcake/... Automated import of CL 143685