Merge "Clean up attribute apis based on api council feedback."