Fix HighTouchSensivity (1/2)

Change-Id: I3d3207fefef496ba787055b1598c60b327ab9bb6
Revert "Fix HighTouchSensivity (1/2)"

This reverts commit 770b22de62eae0a4c269418986a8420e3535bbf0.

Change-Id: I0d243d512220f265f462a98c0dc15372b314e714
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0