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

Change-Id: Id124d26e03d3d91a234e78b5fad1aca682cf9f6d