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