Merge \"Actually compare supported color modes.\" into nyc-mr1-dev
am: 1df0020f2d

Change-Id: Ic30578fd66cdebc0b9c1e25747fe23f3b272fb42