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

Change-Id: I46b9b70fba4386b8af788c86d04825fbcc470f03