Merge "Delete unused poll() code." into jb-dev