Merge "Fix comments in Matcher.java and MatcherTest.java"