Add new color setting am: a14443fac4
am: cf47b0b6d0

Change-Id: Ifcbbadffc426c6f057e29bf4d1c8245efcbea91a