Merge " Fork ContactMatcher.java to RawContactMatcher.java"