Merge "Fix analysis_attributes_ to update missing definitions."