[automerger skipped] Merge "Add columns for color aspects to database" am: 7fd99d2140 am: 354c13027b
am: 7bc18e0a3f  -s ours

Change-Id: If31209585aa0c903aa38908939c6822fb593096f