Merge "bug fix: add missing color formats to the check for valid formats" into oc-mr1-dev am: 6a56323738
am: cbc8c1003f

Change-Id: Ic8d7960eeacd35b36dcb2011cba854dd6d0c2ff6