6fb5a1d0ee
Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 147035
Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 147035