am 69b99d3e: Merge "More IP cleanup."

* commit '69b99d3e6891c46fabc19f9f78ea89e8d9133f9c':
  More IP cleanup.