Merge "Fix \'Exception in thread "main" java.lang.AbstractMethodError:\'"
am: b29a267e02  -s ours

* commit 'b29a267e02f80873fa1697989112e2500c432e44':
  Fix 'Exception in thread "main" java.lang.AbstractMethodError:'