Fix Surface derp for QCOM

Change-Id: I581776ef7f1683e3a687a4f34528ff05a9e2bf58