LPS-34035 Re-add Javadoc

@jcampoy