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

Change-Id: I9d359b70e00ba4fca5de45e0cccbb7be019f3be6