Merge "[qca-nss-drv] Resolved crash observed in 64-bit build"