Merge "Fix build break due to javadoc linking error"