Merge "[qca-nss-clients] Modify ipq60xx to ipq6018"