Original author: xav Merged from: //branches/cupcake/... Automated import of CL 144539
Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 144510