Merge "Java doc fix: @throw -> @throws"