am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs

* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs