Merge "Revert "[DO NOT MERGE] wifi: remove certificates for network factory reset"" into tm-dev