Signed-off-by: John Starks <jostarks@microsoft.com> Upstream-commit: 19645521a92869be7210fb663ed5e0e82e329ca5 Component: engine