Merge "Add initial connectivity metrics handling." into nyc-dev