Add poll timeouts and sleeps

Change-Id: I06bee262056292703a93481d6205cc79b9d461a3