[automerger skipped] Merge "Support static address configuration" into rvc-dev am: 6223b8f4e8 -s ours
am skip reason: Change-Id I0399917e7cefa1547d617e688225544c4fc1a231 with SHA-1 f053e4b6f5 is in history
Change-Id: I8a441c075d7a67f9bb5528c66cbf67df7fbacc60
This commit is contained in: