AI 143683: am: CL 143652 am: CL 143466 Bringing the logging tests down to zero failures.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143683
3 files changed