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

* commit 'b5a6d49e81e3e9d5835c6883f6b876099949e34c':