2170312ab0
Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 146668
Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 146668