Minor cleanups around color usage

Change-Id: I56733cbe933a58d5977c032f056abb35265ee252
3 files changed