Update Javadoc (cherry-picked from 162734)

Issue: SPR-12028