Merge "Remove unused KeyStore field in RecoverableKeyStoreManager" into pi-dev