Merge "Add helper method for Thread.sleep() call to reduce code duplication."