5ac35ad03f
Original author: smain Merged from: //branches/cupcake/... Automated import of CL 147308
Original author: smain Merged from: //branches/cupcake/... Automated import of CL 147308