am 6b3909fd: am a0654a35: Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" into ics-mr1

* commit '6b3909fd72efc7c5ca98d2e1c989025984ad0c38':
  Altering touch feedback for qsb assets. (Bug: 5560273)