Merge "Update annotations to spec for vid"