Revert "Revert "Squashed QCOM DirectTrack commits""

This reverts commit 14b06df801139f6753cbc281703659770ec1b7d8.

May have found underlying problem. Yay.