Merge "Fix bug #18289076 Storage graph colors don't match Material design spec" into lmp-mr1-dev