Merge "Align radio buttons with app icon, change text color." into nyc-dev am: 1ff2412
am: 08738a2

* commit '08738a2f553fed389db81d02c3a93c45945bca74':

Change-Id: I13b6f20f6a48a7221b0c2d590ae36d1f740496e2