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

Change-Id: I2a2c51912332e1defbe24ecb20913a2fdec631e1