Merge "Always prefer poll over select." am: 1405a886d4 am: 5219fd0a82
am: 137d23d36e

Change-Id: I1683c19b6f883d281a5cb2ae9edc92e8c9ba0cab