Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca
am: d8e95f6bda

Change-Id: I1638d0b407db1a990b0c32f3cb14344f524ba8a4