Fix overriding ip configurtion with default one
am: 519e1dcae5

Change-Id: I98f742a008ede5078fca2cdbdb937d4d659dea80