Original author: mritter Merged from: //branches/cupcake/... Automated import of CL 146204
Original author: mritter Merged from: //branches/cupcake/... Automated import of CL 144166