Merge "Revert "Revert "Matcher: Avoid excessive String copies."""