5f75015fef
Original author: brettchabot Merged from: //branches/cupcake/... Automated import of CL 145969
Original author: brettchabot Merged from: //branches/cupcake/... Automated import of CL 145969