Relax restriction on Colormatrix and add Add step.

Change-Id: Iccb519bb40f58f02346b5c0a10c1378cb853e3f8
2 files changed