Merge "Trim leading zeros from ipv4 addrs." into ics-mr1