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

Change-Id: If22d9a4adce19e25caefc011481b3ca39981e03d