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

Change-Id: If24ee756971f9322e0130983d065bb7ab291f12a