Merge "storageproxyd: Fix x86 builds" into main