Merge "Fix config-file provider path"
authorEd Warnicke <[email protected]>
Fri, 24 Aug 2018 16:02:42 +0000 (16:02 +0000)
committerGerrit Code Review <[email protected]>
Fri, 24 Aug 2018 16:02:42 +0000 (16:02 +0000)

Trivial merge