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