Fix HighTouchSensivity (2/2)

Change-Id: Ic46d29eeb875eaf9d9f04b8595f9f07bb6ebbd1d
Merge branch 'cm-11.0' into kk_mkt