Merge "Update API for UiSelector." am: 37ac5004b0
am: 6b2bc1f5ef

Change-Id: Ibe811282942375dba6d21f5c4dc524b995a85ecf