Merge "Fix typo in javadoc" into main