Merge "Update javadocs for API review"