Merge "Add RecoverableKeyStoreDb"