Merge "qca: fix kw issue"