Merge "Add missing features to static IP config"
am: d026189c36

Change-Id: I7be794ac92702945a0f91948438a14f537e13b53