followup to incorporate review comments per previous reviews on PR#29561 Upstream-commit: b39b0c4596d424cd98856fb633183f30807ad0a2 Component: engine