fix dequeue by selector

Change-Id: I691533bf91f7243db93d39679ec9cf654de51b31
Merge "fix dequeue by selector"