Merge "qahw: test: Fix variable overflow issue"