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

Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723