Merge "StaticIpConfiguration: Couple of minor fixes" am: 5c4c9872c5 am: 402e33e6e7
am: d3e4bc9004

Change-Id: I66a1e125c1ecfa456ae7e83153dfc02eb7d7d3b0