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

Change-Id: I12b08c7bc320eb6cbbb8c0cafbe1e24d5f6ea41f