Add new color setting am: a14443fac4 am: cf47b0b6d0
am: a63afba919

Change-Id: If39541922f1dd24941a4cefda31d2c1dbe87727c