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

Change-Id: I9c23f5392e629b729c9a0d4bfa89c0dc73f3b245