Merge "Ambient indicator text color" into oc-mr1-dev
am: 88d75329ff

Change-Id: I8b68677f96f9e8431abcbf85701e7065acaa3b36