Merge "Change Touch to Tap" into nyc-dev
am: 852436b190

* commit '852436b190f00487459dc3236df3ac539034689c':
  Change Touch to Tap