Style/color fixes to match UX spec.
am: 22662decb7

Change-Id: I3f29406ac4334e37a4245303cdb7ba88e1aaebbe