Merge "Add TruststoreFile provider"