Merge "DO NOT MERGE Removal of Pointer APIs." into nyc-dev
am: bcca71f5ce

* commit 'bcca71f5ceeb7e05d0207c28ed9ad8f9345f27d8':
  DO NOT MERGE Removal of Pointer APIs.

Change-Id: I0f35b63f04e4dae3c1d7fe87b42832f84bf7c277