am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

* commit 'fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
  DO NOT MERGE Sanitize WifiConfigs