Fixed IP validation

Closes-Bug: #1263700

Change-Id: Id9833912b3ce427aaea401d4efea32c46d42d3da
Merge "Fixed IP validation"