Merge "Fix compiling with javac" into oc-dev