remove redundant mount/unmount calls on commit Upstream-commit: 1f472c37687fd1f66e574df3ba773fde5be57e2d Component: engine