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

Change-Id: I7fdf83db6cbf26cdc5b8a9971fa48b7f8458474d