Ensure that only one IP address is allocated.

Fixes bug 1122899

Change-Id: I03f7509977a37bfcb8f1698a83638be3079065a0
Merge "Ensure that only one IP address is allocated."