Merge "Add ColorUtilsTest and associated fixes" into lmp-mr1-ub-dev