Merge "Update annotations to spec for aaf"