Merge "Migrate WifiStateMachine to IIpClient" am: 5e0dec49c7
am: 3ae258ffaa

Change-Id: Ie7c965e5a437bc01abfd362cd027bcd50bce339e