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

* commit 'ae73bbf4eac5098217c1eaa095116b3f0debac71':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Ifacda36794372d26a98ef57cde10a95a48a95b92