am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev

* commit '35094376726c3a0d4b6fa73ef836f733fad39ae9':
  Fix assist for hardware long-press