Merge "Clean up log file size increase logic"