Merge "Update API documentation per api-council feedback."