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

Change-Id: Ia0e8fe48ecff3911a1d88fb1cd71e67b833e0076