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

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