Merge "Always prefer poll over select."
am: 1405a886d4

Change-Id: I48d5244d26d3c4311d2f418ab492dd5cce55b549