diff --git a/tensorflow/core/protobuf/device_properties.proto b/tensorflow/core/protobuf/device_properties.proto
index bb3d187ee68..9b1497c710d 100644
--- a/tensorflow/core/protobuf/device_properties.proto
+++ b/tensorflow/core/protobuf/device_properties.proto
@@ -17,6 +17,7 @@ syntax = "proto3";
 
 package tensorflow;
 option cc_enable_arenas = true;
+option java_outer_classname = "DevicePropertiesProtos";
 
 message DeviceProperties {
   // Device type (CPU, GPU, ...)
@@ -47,4 +48,4 @@ message DeviceProperties {
   int64 memory_size = 12;
   // Memory bandwidth in KB/s
   int64 bandwidth = 13;
-}
\ No newline at end of file
+}