More color changes

Use classes instead of fill colors for bubble graph

Change-Id: I14f5faf608cc4da7b6f002b2abf1d1fdae0244d3
Merge "More color changes"