b6d49645b1
Original author: krosaen Merged from: //branches/cupcake/... Automated import of CL 143227
Original author: krosaen Merged from: //branches/cupcake/... Automated import of CL 143227