e4b6b7e2f6
Original author: ramanan Merged from: //branches/cupcake/... Automated import of CL 145981
Original author: ramanan Merged from: //branches/cupcake/... Automated import of CL 145981