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

Change-Id: I65deab395c4a8f58c8768138ffba88aad839e9b9