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

Change-Id: Ic40a6d4221cdb39e40b895efbe313160b7ab0846