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

* commit '7305ff763c872fcbf85a96892aa8a42fc6eb63ac':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I14d368b89afe8cc2deca06dccfb44eca2c7c5d02