Merge "Data race in initialization of misc files info"