diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 53e4e31..adde6b2 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -47,7 +47,7 @@
     return mSize;
 }
 
-OperationResult::OperationResult() : resultCode(0), token(), inputConsumed(0),
+OperationResult::OperationResult() : resultCode(0), token(), handle(0), inputConsumed(0),
     data(NULL), dataLength(0) {
 }
 
@@ -57,6 +57,7 @@
 void OperationResult::readFromParcel(const Parcel& in) {
     resultCode = in.readInt32();
     token = in.readStrongBinder();
+    handle = static_cast<keymaster_operation_handle_t>(in.readInt64());
     inputConsumed = in.readInt32();
     ssize_t length = in.readInt32();
     dataLength = 0;
@@ -79,6 +80,7 @@
 void OperationResult::writeToParcel(Parcel* out) const {
     out->writeInt32(resultCode);
     out->writeStrongBinder(token);
+    out->writeInt64(handle);
     out->writeInt32(inputConsumed);
     out->writeInt32(dataLength);
     if (dataLength && data) {
diff --git a/keystore/include/keystore/IKeystoreService.h b/keystore/include/keystore/IKeystoreService.h
index f671077..cbdab83 100644
--- a/keystore/include/keystore/IKeystoreService.h
+++ b/keystore/include/keystore/IKeystoreService.h
@@ -51,6 +51,7 @@
 
     int resultCode;
     sp<IBinder> token;
+    keymaster_operation_handle_t handle;
     int inputConsumed;
     std::unique_ptr<uint8_t[], MallocDeleter> data;
     size_t dataLength;
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 46bc174..560b261 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -2732,6 +2732,7 @@
         sp<IBinder> operationToken = mOperationMap.addOperation(handle, dev, appToken, pruneable);
         result->resultCode = ::NO_ERROR;
         result->token = operationToken;
+        result->handle = handle;
     }
 
     void update(const sp<IBinder>& token, const KeymasterArguments& params, const uint8_t* data,