Merge "Fix some Java doc errors" into rvc-dev