Merge "WifiInfo: Changes to remove dep on connectivity"