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

Change-Id: I80fbb8a94b162d5b080fd5480a68c5a4045dab01