Merge "Update RecoveryController to use KeyStore grant API."