Use selector wrapper, fix busy looping.

Change-Id: If13ee64d3ac800c4ffa2e83d2b73e1c07f9c6949