Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev