Merge "Fix leak in WifiManager" into jb-mr2-dev