Bug 1353605: Raise correct exception upon ip address exhaustion

Change-Id: I1f30da3f3abd38348e9d2f50ea50aae1b43d6e87
Merge "Bug 1353605: Raise correct exception upon ip address exhaustion" into R1.10