Merge "Rename updateWaitTime since a lock is held"