diff --git a/oak_private_memory/database/icing.rs b/oak_private_memory/database/icing.rs
index 99a69187ec..eb5a3d4714 100644
--- a/oak_private_memory/database/icing.rs
+++ b/oak_private_memory/database/icing.rs
@@ -633,9 +633,13 @@ impl IcingMetaDatabase {
         let mut pending_views: Vec<PendingLlmViewMetadata> = Vec::new();
         if let Some(views) = memory.views.as_ref() {
             for view in &views.llm_views {
-                // TODO: yongheng - Generate view id if not provided.
+                let mut view = view.clone();
+                if view.id.is_empty() {
+                    let random: u128 = rand::rng().random::<u128>();
+                    view.id = format!("{:032x}", random);
+                }
                 if let Some(pending_view_metadata) =
-                    PendingLlmViewMetadata::new(memory, view, &blob_id)?
+                    PendingLlmViewMetadata::new(memory, &view, &blob_id)?
                 {
                     pending_views.push(pending_view_metadata);
                 }