b8c055e7cb
Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 143267
Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 143267