Allow passing in the IPv4 and IPv6 addresses on the command line.
am: f0fac8631a

Change-Id: I517a52334a89a87eafacfdc9e2f862ca87d5f56d