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