Merge "Updating javadoc for few APIs" into main