Merge \\"IpConn metrics: use @IntDef\\" into nyc-mr1-dev am: 018a205824
am: 48d9a3d42f

Change-Id: I526e118a53f6402c1728df33c623d281c3ae3e79