Merge "Use MaterialColorMapUtils"