LPS-38435 Javadoc (resend)

I removed my commit without an LPS title and is now located after your "Edit Javadoc" commit. I also deleted your Regen commit since you'll have to re-do it. Sorry about that!