Merge "storageproxyd: Remove duplicate interface definition" into main