Resolve conflicts for backport of #43534

Resolves merge conflicts for the v16 backport of #43534 and keeps the status check on the Download Report button.