Refactor to optimize storage driver ApplyDiff() Upstream-commit: e850568bf6f67b5fadd9767544b1cf7bc6fcc317 Component: engine