f64cc759bb
Original author: romainguy Merged from: //branches/cupcake/... Automated import of CL 145472
Original author: romainguy Merged from: //branches/cupcake/... Automated import of CL 145472