Merge "Fix QS header touch targets" into oc-dev
am: 17e512528f

Change-Id: I30166062d1bb53d773d5d187746c65126d5499ed