Merge "WifiInfo: Fix javadocs to reflect the new behavior"