This takes 7s of sleep time off of a unit test run. Change-Id: I88f2e68abf92819d68f7692917354b9edbebfde5