Merge "Zen radio button is width 48dp" into pi-dev
am: 24f3d3aba8

Change-Id: I535ab0a2b8127e35f437cac877ad3a5be34df8f4