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

Change-Id: I7e26ad486d3478c405d2547fb43accf01a7328e5