Merge "init/epoll: Switch to aggregate initialization"