Fix more diagnostics with CA2263#100490

buyaa-n merged 2 commits intodotnet:maindotnet/runtime:mainfrom

buyaa-n:fix-diagnosticsbuyaa-n/runtime:fix-diagnosticsCopy head branch name to clipboard