AI 146535: am: CL 146128 am: CL 146126 Fixes from the review of 'Bringing RegEx down to zero broken tests.'
  Original author: ursg
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146535
2 files changed