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

Change-Id: I5e6d948373c8f8ff2892c843329a7d2b540b8706