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

Change-Id: I7c2b395ef69ed2031834a2e93925e4136cb4c0d0