Merge "Fix minor problems with interface verification and default methods." am: 3482c27127
am: c798654738

* commit 'c79865473816d790d62f8f1f422b5d34632b8229':
  Fix minor problems with interface verification and default methods.