Merge "Enabled content validation in file ops tests."