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

Change-Id: Id41938a08fbf9093b83a6d3b4866d959aeb14e97