Merge "Fix annotations javadoc build"