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

Change-Id: Ic3cb2a0bb3fba97b166efc7a8e0c0df01aa7a7da