Merge "Don't restore EAP-TLS networks from backup" into klp-dev