Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f8858 am: c3b564e2 am: bcc449ee Change-Id: I070f5c7088ce237995f995c2aa097e1f04cc4000