Fix build and fix new colors for TRDS

Change-Id: I64b60543ca999e1e3b6f378c2123857f7b0b4e7f