am e3f3d291: am 129d71d8: Merge "move the provider authority to a config class" into jb-ub-now-indigo-rose

* commit 'e3f3d291cd8505332f694fe02f0e2e6b36b64105':
  move the provider authority to a config class