Merge "[qca-nss-clients] Removed unused 6rd message fields"