![Joe Onorato](/assets/img/avatar_default.png)
(and add a test that helped me debug it) Original author: joeo Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143279
(and add a test that helped me debug it) Original author: joeo Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143279