[automerger skipped] Merge "Add missing features to static IP config" am: a80cdd187b
am: 11d2d05db6  -s ours

Change-Id: I145c2a63f0fce4d527d19d35949bdd938df3991e