Merge "Delete the clatd code that assigns IPv4 and IPv6 addresses." am: ba1b820b53 am: 67344ccf9f

Original change: undetermined

Change-Id: I20e08bb3c1115319b3b1f5909f945168eab72317