54a7a0d27b
Original author: ramanan Merged from: //branches/cupcake/... Automated import of CL 146124
Original author: ramanan Merged from: //branches/cupcake/... Automated import of CL 146124