Merge "Update javadocs based on API council feedback."