Merge "DO NOT MERGE Remove Pointer Capture API." into nyc-dev
am: d48a67a190

* commit 'd48a67a190f785b5f5d1b41a5a8823592730deb7':
  DO NOT MERGE Remove Pointer Capture API.

Change-Id: Ibb2d8315d3d2bf2eeee1f4ea7a54e6aac022cb8e