Merge "Fix obsolete method change check." am: 494505a9de am: fa385ddeaa am: 025ad9c93b
am: 880081f3df

Change-Id: I11f160618a92b3a4c7ee19a6c73d3bcfc7f455fb