Signed-off-by: John Gossman <johngos@microsoft.com> Upstream-commit: 80e9f6f83856b8e762f030d5e562f9e9f8d17233 Component: engine