Merge "Move computation of decodeColor- Type and Space" into pi-dev am: 6d39e55020
am: 9ec6c3af9e

Change-Id: I26508380412a313dbd7a52e924bb044ca4404b33