Commit 9e337341d54c4ee12eec58e025a6831bb976d61f

Behdad Esfahbod 2018-03-14T15:52:53

[color/cbdt] Clean up