Merge \\"Refactor display color transforms\\" into nyc-mr1-dev am: 94673f0b7c
am: 5f3bf63121

Change-Id: I06a60ef4a1fa23e0c1f5b6ab97462811b6aaf239