Merge "Matcher: Avoid excessive String copies."
am: f69b674ee4

Change-Id: Ie2edfeebce608bee15a37bf973f517512dcc9734