Merge "Update annotations to spec for clamp"