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

Change-Id: I15cabf9e4146f1f0d0c31b24d222c34b8477cdb7