cef302d095
Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 146655
Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 146655