Merge "Track API changes associated with AbstractMethod refactoring"