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

* commit '5175b3c9923f5eaf5eafa01798966f8711ce9547':
  Fix assist for hardware long-press