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

* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
  Trim leading zeros from ipv4 addrs.