Merge "Color management, the missing pieces" into oc-dev
am: 7dfa16c2ef

Change-Id: I258ae87aeb739f3df1d1aef00fb055861c757111