Fix PatternTest failures.

Bug: 10127357
Change-Id: I202e77d0ea0c8b407aca364ad81c8ae1f9c617ad
3 files changed