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

Change-Id: I31b67abe5830cf24edbe7eb0c3191f6ac984733b