Merge "Update to TF logfilesaver API change"