[automerger skipped] Merge "Support static address configuration" into rvc-dev...
[automerger skipped] Merge "Support static address configuration" into rvc-dev am: 17c6d8f4 -s ours am: 03a81257 -s ours
am skip reason: Change-Id I0399917e7cefa1547d617e688225544c4fc1a231 with SHA-1 b69c39ad is in history
Change-Id: I178d7b119ce2f11ce03acc5491b87224625d60a6