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

* commit '9acf475c6c9589c5e10ca68cb321de05985b927e':
  Fix assist for hardware long-press