Merge "Work around spurious epoll notifications." into mnc-dev