Merge "[javadoc] add missing space" into main