diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java
index 8f9d7481622..4996f02fc9b 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/TransportContext.java
@@ -43,7 +43,7 @@ public abstract class TransportContext {
   public abstract Priority getPriority();
 
   @Override
-  public String toString() {
+  public final String toString() {
     return String.format(
         "TransportContext(%s, %s, %s)",
         getBackendName(),
diff --git a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java
index d50f16e7f59..88e75cc37ac 100644
--- a/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java
+++ b/transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/jobscheduling/JobInfoScheduler.java
@@ -29,6 +29,7 @@
 import com.google.android.datatransport.runtime.scheduling.persistence.EventStore;
 import com.google.android.datatransport.runtime.util.PriorityMapping;
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.zip.Adler32;
 
 /**
@@ -60,8 +61,8 @@ public JobInfoScheduler(
   @VisibleForTesting
   int getJobId(TransportContext transportContext) {
     Adler32 checksum = new Adler32();
-    checksum.update(context.getPackageName().getBytes());
-    checksum.update(transportContext.getBackendName().getBytes());
+    checksum.update(context.getPackageName().getBytes(Charset.forName("UTF-8")));
+    checksum.update(transportContext.getBackendName().getBytes(Charset.forName("UTF-8")));
     checksum.update(
         ByteBuffer.allocate(4)
             .putInt(PriorityMapping.toInt(transportContext.getPriority()))