Merge "Support specific client address configuration" am: 5fca2175db

Change-Id: I9a341a9269786c700ebed2432f9875ae4b1f07f5