Improved javadoc (#10632)

Change-Id: Iec54c7425e5ee00d9dbc7dff5cf5ae8dbf28d214