Merge "Fix obsolete method change check."