Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev am: 41d6d7c4 am: 64209d7b Change-Id: I849a1b78ce08038bf7e134d0b6fe19de8e3c5246