Merge "Update annotations to spec for sdnc"