Merge "Updating datafile collector in oom"