Merge "Fix base dropdown pref layout" into nyc-mr1-dev
am: 0a52f2fe2a

Change-Id: I511aacc6c05bcfcc0a84caeb1d083f7024b41c6f