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

Change-Id: Icceb5e5aa4ba12ac837b838e07d338a805f37614