am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs

* commit '2d3f03d7fb5d955cd16d4152c8767c7974ebb54e':
  DO NOT MERGE Sanitize WifiConfigs