Merge "Fix CHA in the presence of default conflict methods."