Replaced a Select with ComboBox (#13234)

Change-Id: Ida5363e1895889cfa3e350f5348958d559c407a6