Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
Merge "Reland "Add columns for color aspects to database"""