More color fixes

The last commit didn't properly resolve the colors issue on Lollipop,
so we'll go ahead and fix that here.

Bug: PASTE-10
Change-Id: If7437d46d657e586a32be303aacc3b8acf0d2c63