[automerger skipped] Merge "Support specific client address configuration"...
[automerger skipped] Merge "Support specific client address configuration" into rvc-dev am: ad6540d6 am: d6ca1051 -s ours
am skip reason: Change-Id I96bc24a9c30bfc48dff38c3c4456085694fd381c with SHA-1 fc99f19f is in history
Change-Id: Ib3956a739a0694d29bffb7960655c7715c51331f