8007675: Improve color conversion

Reviewed-by: prr, jgodinez
2 files changed