Merge "Fixed file props test failure for MemoryFileBackend"