Merge "WifiManager: Fix javadocs"