BUG=1739507 Original author: lockwood Merged from: //branches/cupcake/... Automated import of CL 143209