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

Original change: undetermined

Change-Id: Ib0bc72480277c47c02de6af22f43ae2843f4eaf7