Merge change 20072

* changes:
  Update to use new multi-pointer APIs.