Merge "Return a valid error code when adding an invalid IP address."
am: f3ff94b702

Change-Id: I55425950fe2f328c7e7ce46af5eda52e2c53b311