Merge pull request #14797 from dwi2/bug937561

Bug 937561 - get both available network list and known network list, and...
(cherry picked from commit 065cba7bd8c3d8ad0ec424c2c2893b96bae6e54d)
Revert "Merge pull request #14611 from arroway/bug-797661"

This reverts commit 724d36716bcbbc5cee1af18b94cc328c289d0ccc.