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

Change-Id: I74d9616ff4b99d94f225555f9c23ecf6e431744c