Merge "Track IP addresses in WifiStateMachine." into klp-dev