Merge "Fix obsolete method change check."
am: 494505a9de

Change-Id: Ie3dac35eb222fb3662b2588576ca71c7a029495a