Avoid calling oldFileFromRowFactory field directly

Change-Id: Ibbd5a8baa27015eec443349a67edc57ede5d174d
Merge "Avoid calling oldFileFromRowFactory field directly"