Fix base dropdown pref layout am: 451150d0d2 am: d9350898c0
am: 12b3940468

Change-Id: I35d8b95d6e812e00e2cc8be4a9cb8c880a78b6e6