Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f968 am: e67395a9 am: 80fba493 am: ee05b648 Change-Id: I29e7c9ce4c437ac3e012516a2bfd4c3cf8981aae