Merge "Fix verifier checks on interface methods." into oc-mr1-dev