Merge "DO NOT MERGE IpConnectivity metrics: add version number" into nyc-mr2-dev