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

Change-Id: I523d75980de418f7674ee4882525e8ae9423d877