Merge "Fix verifier checks on interface methods." am: 9a19be9c17
am: e6942125e3

Change-Id: I3b4e87d05b687ceddefcf6559bd0255714f7ed49