Merge "Update javadocs as per API council feedback"