Merge "Move DhcpClient SM thread onto IpClient's SM thread"
am: 4a352dd5e0

Change-Id: I19f1606e017b8c4e92c4575b9e39c1b5198c31aa