This allows us to skip the wait times during unit tests. Change-Id: Ie28cccee9315a9503ab9554b6e6ce6a0e7c58430