Merge "Fix broken ColorDisplayServiceTest cases" into qt-r1-dev
am: f351094e88

Change-Id: I1dd114df9ab2a86fbba730685e9dd67f3064363f