Merge "Adding Metrics/protos in the ConnectivityService"