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

Change-Id: I4771be30b206c9f36e5127608c0f27d5bfb6b0ae