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

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