Merge "IpConn metrics: use @IntDef" into nyc-mr1-dev