Merge changes Ia91b3b3c,Id9ecdac5,I4b17d1b1

* changes:
  Revert "[NS D01] Remove candidates that don't satisfy the request."
  Revert "[NS D02] Mix in the ignore on wifi policy."
  Revert "Address comments on ag/10316753"