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

* commit 'b6223b4d6b479ddb2ce91e28348df123d944e4a0':