Merge "Update normal dark button colour to match UX specs." into cw-f-dev
am: 2d5bbf7d92

Change-Id: I81f0b5ceaacf3b972fe08fd512b32dd73ecb050d