Merge "qbt1000: Fix for incorrect buffer size check and integer overflow"