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

Change-Id: Iec1fc62d8e3fbc55f4a835bf664c908c9ec30b59