Merge "storageproxyd: Use alternate data path if in DSU state" into sc-v2-dev