Don't add 500 usec for 0ms sleeps and always round up the sleep
time so we won't sleep too short.

Change-Id: I28dda435de44031c050b6edbfae1e9d392465d24