![Mike Lockwood](/assets/img/avatar_default.png)
BUG=1739507 Original author: lockwood Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143360
BUG=1739507 Original author: lockwood Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143360