am 5287c133: (-s ours) am 69b99d3e: Merge "More IP cleanup."

* commit '5287c1335a7791c8c3a73f1dd8e33bd448016355':
  More IP cleanup.