Merge "Remove services.connectivity-netstats-sources"