Merge \\"Fix missing IpConnectivity metrics\\" into nyc-mr1-dev am: 66e7752ad1
am: b2db402899

Change-Id: I4bde99c78876b7a877f55ccfb1d62645dd0a595d