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

Change-Id: I14aeb61b5f340826b707836111ce140d066a5d50