Merge "Fix WifiInfoTest flakiness" into jb-dev