Merge "Separate file utilities from utils.cc"