Merge "Reland "Add columns for color aspects to database""" am: 7d29f33090
am: a9a8d56bf4

Change-Id: I28a16ef0b3ad5d656759334163e7da7f215052fe