[automerger skipped] Merge "Revert "Add columns for color aspects to database"" am: e98bdba73a am: 296b7ccffe
am: 2b7cdbbfd2  -s ours

Change-Id: Ifdea0a1408848bb2387f3fa3c958d70aabbea6bc