Merge "Adjust graphics dataspace references to new standard" into nyc-dev
am: 61adad8

* commit '61adad884b8d5fb8e2aa38b693bc2dce39bf92c8':
  Adjust graphics dataspace references to new standard