per app color cleanup

Change-Id: I89a9daef5415af14f22e744d9186f750f7fbcafa