Merge "Update javadocs for API review" am: bbf2a83826 am: 166b068da5

Change-Id: I71f156454b8cd3cf7f95e7fdef1712d93156c610