Merge changes from topic "am-002ad919bad249f3b11d8215de81b6c6"

* changes:
  [automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am: f276a56215 am: 7e3864bc99 am: e53008bed5 -s ours am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1 9cf3e7ae68 is in history
  Allow requestNetworkScan to return sanitized info am: c9d7430685 am: 87217889f1 am: 9e1d425b58