Merge "Change secondary_text_color to match spec" into pi-car-dev am: ef9b360c2a am: 70d5d81797 am: eb63795c78 am: d5eacbc467
am: 5cd68af38a

Change-Id: I8f699f5d611fd14fbea9e9a015cb7fa862f23335