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