am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

* commit '4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
  DO NOT MERGE Sanitize WifiConfigs