Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d am: e67395a97a am: 80fba49386
am: ee05b648c7

Change-Id: I29e7c9ce4c437ac3e012516a2bfd4c3cf8981aae