Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: 7305ff763c
am: 2c1c93b8e9

* commit '2c1c93b8e911dbd2e3b2f19497f7d65cf6359b82':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Ic15c2e2e7b07c81f7e6d60badb1a17211b799e53