Merge "Fix java-doc reference"