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

Change-Id: I3a4680654667794e787430abffe56f54c500b2d5