Merge "Fix padding on round devices for AlertDialogs." into nyc-mr1-dev