Merge "Refactor color space attribute processing." into pi-dev
am: b2a20f62de

Change-Id: I276750c55684485ec46f8ee6ac99092625e78dd7