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

Change-Id: I128c5a69a496df653185b1be22412f897c88250e