Merge "Ignore native color spaces following Change I0164a18f"