Merge "Increase LocalFile lock() timeout and improve error message"