Merge "Update annotations to spec for dcae"