Merge "Add workaround for javadoc verify jobs"