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

Change-Id: I53ec407f2a5762a2420d8370fca32a28b12fdded