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

* commit '72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
  DO NOT MERGE Sanitize WifiConfigs