Merge "Prepare KeyStore RecoveryController API for review."