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

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