Merge "Increase timeout for reimage operation"