Changes to use multiple IPv6 addresses

Change-Id: I5cf884d9474dab27f697311f2693b9aace0c638d
Merge "Changes to use multiple IPv6 addresses"