Update Javadoc

Issue: SPR-12028