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

Change-Id: Id83620cf879e969884a74139e836896b010e50d1