Merge "[qca-nss-drv]:ext ap change"