Merge "Update annotations to spec for policy"