Add manual configuration for IPv6

Change-Id: I6bc531a4e8d3aca2b8bfa004888295c54c7fda76
Merge "Add manual configuration for IPv6"