Merge "bug:3474580 fix javadoc"