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

Change-Id: Icbb60959797407d72cca9fe6e9278d68f1afd498