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

* commit '46e30763df273ea1ba6f102c8a8557b36ba5cc8a':
  Fix assist for hardware long-press