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

* commit 'affeccf1b557c214490bc7c2d90bf0d07f2c198b':