Merge "Merge "Swap radio button alphas." into nyc-dev am: 0ccd9cef14 am: ea7a6db175" into nyc-mr1-dev-plus-aosp
am: 3dc2dc483d

* commit '3dc2dc483dfbe2409c3801adbd2250ba608524a9':

Change-Id: Ia41e22c3595d5b87cfed16e9f992781173c7c951