Merge "Fix file access issue in DummyProviderImpl"