Merge "Ambient indicator text color" into oc-dr1-dev am: 5c6c7586cd  -s ours am: af12e50e00  -s ours
am: 000aedd5f4  -s ours

Change-Id: Ic2ac7b8eab5bdf71377fac70dce7788426851212