Merge "Color transforms are now color modes." into nyc-mr1-dev