Merge "Fix 'Exception in thread "main" java.lang.AbstractMethodError:'"