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

Change-Id: Id4e9ef06d91b3fde5f727efce8249d6f5a794f94