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

Change-Id: If41836cf7f4a92d5c2cc385b8a204153be1c18d0