Signed-off-by: Stefan J. Wernli <swernli@microsoft.com> Upstream-commit: 9b648dfac6453de5944ee4bb749115d85a253a05 Component: engine
Signed-off-by: Andrew Page <admwiggin@gmail.com> Upstream-commit: fa3ec89515431ce425f924c8a9a804d5cb18382f Component: engine