Merge "Use a log group for LocalFile lock errors"