Merge "Skip publishContentProviders() when we have zero." into nyc-dev