[automerger skipped] Merge "Add missing features to static IP config" am: 5a4b8793d4
am: 844709958d  -s ours

Change-Id: I145c2a63f0fce4d527d19d35949bdd938df3991e