Merge "keep legacy HAL_DATASPACE enums unchanged" into nyc-dev