Merge "touch less, tap more." into nyc-dev
am: 8e060d31d1

* commit '8e060d31d14163858e55b412f0490b19b2f44dd1':
  touch less, tap more.

Change-Id: I3ed3436fd0f45d34a914bfebba39c4d274d198e9