Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d
am: 3fa8bc066b

Change-Id: I4931c55a7390f2d186821f1f734af1f42a0a9798