DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
am: 2f3553e1ed

Change-Id: Ibd4517cb5e5826a855840ff2259316a5177b779a