AI 143668: am: CL 143635 am: CL 143456 Bringing the text tests down to zero failures.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143668
2 files changed