Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d am: 3fa8bc066b am: 8ed37211bd
am: 025813ad65

Change-Id: I496b31b959873bd0dd5b8a80b7e54cbb6e918791