Merge "[qca-nss-drv] Pull in changes from coconut for a unified mainline"