[automerger skipped] Merge "Reland "Add columns for color aspects to database""" am: 7d29f33090 am: a9a8d56bf4
am: b0bc52c339  -s ours

Change-Id: Ic87b4bb169d6bd438208a589e341bbc29332f118