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

Change-Id: Ibf3e7fab17af69b2d7225661d29e022a933650a2