Merge "IpClient: fix in InitialConfiguration validation." am: 18c144cf62 am: 9146877539
am: 71d23c3e81

Change-Id: I7fe3517e53aa29b8ea1f45b6351f89cdfd2af5ba