Merge "StaticIpConfiguration: Couple of minor fixes"
am: 5c4c9872c5

Change-Id: I29469c22d25fd812590f7adca23ef83337580b2b