Merge "Track: Revert some needless differences vs upstream in Matcher.java"