Merge \"Merge \\"Enable tap-to-pulse only when needed\\" into nyc-mr1-dev am: d94a40f46d\" into nyc-mr1-dev-plus-aosp
am: 6ffddc03b7

Change-Id: I82b7c5fe4cd8178e1e8860fa02fd03aa69a0c00a