Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev