Merge "Revert "storageproxyd: Use alternate data path if in DSU state""