Merge "Fix touch target on QS date" into oc-dev
am: aae6023996

Change-Id: I1ebc276b9017265c37cebe40ddd73dbcdf2ba715