Avoid extra mount/unmount during build Upstream-commit: 3f1e6b63682b54bc245e805a0ee5d6422203fd45 Component: engine