757714fd15
Original author: smain Merged from: //branches/cupcake/... Automated import of CL 147327
Original author: smain Merged from: //branches/cupcake/... Automated import of CL 147327