eeb4672371
Original author: romainguy Merged from: //branches/cupcake/... Automated import of CL 145482
Original author: romainguy Merged from: //branches/cupcake/... Automated import of CL 145482