Merge "Prevent the inlining of ProviderConfig.AUTHORITY" into ub-now-master