Merge "Update 1 min timeout to 10 min."