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

Change-Id: Id27a09b9b62d115c240dedf1aa9bf8bc0b67cefc