Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."