b9f15d7b3c
Original author: yslau Merged from: //branches/cupcake/... Automated import of CL 143905
Original author: yslau Merged from: //branches/cupcake/... Automated import of CL 143905