Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev
am: 41d6d7c424

Change-Id: I38d4c4d99879961631b6596d1f37a65afe11a5b1