Fix overlay test running on overlay Upstream-commit: 2e236d0255bd6f4f5f37c2512f89b22655d47d1f Component: engine