[automerger skipped] Merge "Add missing features to static IP config" am: a80cdd187b am: 11d2d05db6 -s ours
am: f66e23c47b -s ours
Change-Id: I88198a063e6971733552cf9f083b9645880bed8f
This commit is contained in: