Merge "Update annotations to spec for sdc"