Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
am: 111e1dc6b3

Change-Id: I6536baf47e102331fa87112d4f0b9d15ec432d2a