Merge "SF: Fix unit test getColorModes() expectation" into pi-dev
am: 2349051fb6

Change-Id: I9aa04a7d5d5a9078e0a1a8b47d48ad78dd3dd5c2