am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev

* commit '074dc2eb2da23976bc2916cfe7c61dfcd9977e8f':
  Don't restore EAP-TLS networks from backup