diff --git a/gnss/1.0/IGnssCallback.hal b/gnss/1.0/IGnssCallback.hal
index 041f949..97a28e2 100644
--- a/gnss/1.0/IGnssCallback.hal
+++ b/gnss/1.0/IGnssCallback.hal
@@ -111,7 +111,7 @@
         /*
          * Contains additional data about the given SV.
          */
-        GnssSvFlags svFlag;
+        bitfield<GnssSvFlags> svFlag;
     };
 
     /*
diff --git a/gnss/1.0/default/Gnss.cpp b/gnss/1.0/default/Gnss.cpp
index 37810be..66be37e 100644
--- a/gnss/1.0/default/Gnss.cpp
+++ b/gnss/1.0/default/Gnss.cpp
@@ -121,7 +121,7 @@
             .cN0Dbhz = svInfo.c_n0_dbhz,
             .elevationDegrees = svInfo.elevation,
             .azimuthDegrees = svInfo.azimuth,
-            .svFlag = static_cast<IGnssCallback::GnssSvFlags>(svInfo.flags)
+            .svFlag = svInfo.flags
         };
         svStatus.gnssSvList[i] = gnssSvInfo;
     }
@@ -205,7 +205,8 @@
         info.cN0Dbhz = svInfo->sv_list[i].snr;
         info.elevationDegrees = svInfo->sv_list[i].elevation;
         info.azimuthDegrees = svInfo->sv_list[i].azimuth;
-        info.svFlag = IGnssCallback::GnssSvFlags::NONE;
+        // TODO: b/31702236
+        info.svFlag = static_cast<uint8_t>(IGnssCallback::GnssSvFlags::NONE);
 
         /*
          * Only GPS info is valid for these fields, as these masks are just 32