Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev