Merge "Do not filter out some colors" into oc-mr1-dev am: a9774680f8
am: 69bb2bae90

Change-Id: I04da1b0857fcdecf8f662936f41ddb7bc026dd21