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

Change-Id: I7b91cad3efff1342c60bdf9bc50291987fe1f3a5