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

Change-Id: I895fb10aef2df37f4399c6a0f42d7bd05275a0d1