docs: Javadoc fixes am: 42be03df6a
am: 55496c767c

Change-Id: I53ccef8e05cd3f9ceb7a33d9a36bccaed153bf44