[GIT PULL] QCOMTEE fixes for 6.20