Merge "Minor UI adjustments to a11y button chooser" into oc-dev am: 585f7c1b20
am: 6d3b647619

Change-Id: Ib8a88a88e45c413023ade808fe230b7f7f1fa1fd