Merge "Style/color fixes to match UX spec." into nyc-andromeda-dev
am: aa86dcd02b

Change-Id: Icf4aa124245fc7b25c5a462e2d450aef7b84485a