getting rid of sleeps

Change-Id: I3a387d6e3976befa17b8208d2061ddc3fca1057a
5 files changed