diff --git a/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp b/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp
index d5f2373..c742db5 100644
--- a/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp
+++ b/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp
@@ -45,7 +45,7 @@
 
 std::vector<aidl_vehicle::VehiclePropValue> prepareTestValues() {
     std::vector<aidl_vehicle::VehiclePropValue> values;
-    long timestamp = 1;
+    int64_t timestamp = 1;
     for (auto& property : defaultconfig::getDefaultConfigs()) {
         values.push_back({
                 .timestamp = timestamp,
diff --git a/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h b/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h
index 981088a..58531b9 100644
--- a/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h
+++ b/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h
@@ -39,7 +39,7 @@
 // A request type for 'setValues' or 'getValues' method.
 struct VehiclePropValueRequest {
     // A unique request ID set by the sender.
-    int requestId;
+    int64_t requestId;
     // The property to get/set.
     ::aidl::android::hardware::automotive::vehicle::VehiclePropValue value;
 };