Merge changes I4a15d0c5,I9ca87d92

* changes:
  [WifiCandidates] Include networkId in key fields
  [WifiCandidates] Grouping by network