66b8ec99c5
Original author: mathias Merged from: //branches/cupcake/... Automated import of CL 143171
Original author: mathias Merged from: //branches/cupcake/... Automated import of CL 143171