am f6faa4d2: am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev

* commit 'f6faa4d292186bd5927de59f96cfe7a2cb04156c':
  Update material colors