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

* commit 'd81b8de590ee4d06315b925816d7e175a1658176':
  Add ColorUtilsTest and associated fixes