321ae681ca
Original author: hackbod Merged from: //branches/cupcake/... Automated import of CL 143173
Original author: hackbod Merged from: //branches/cupcake/... Automated import of CL 143173