Merge "Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: 7305ff763c am: ae73bbf4ea" into nyc-mr1-dev-plus-aosp
am: 6e356e740a  -s ours

* commit '6e356e740aea4a8e22f9071469c2aefbd5fe2da5':

Change-Id: Iec87f4d99f4512d9aad23de5a0060e27074e962a