diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp
index 6bca692..1a1118c 100644
--- a/camera/ndk/impl/ACameraDevice.cpp
+++ b/camera/ndk/impl/ACameraDevice.cpp
@@ -1185,8 +1185,8 @@
     }
 
     CameraMetadata metadataCopy = metadata;
-    // Copied from java implmentation. Why do we need this?
     metadataCopy.update(ANDROID_LENS_INFO_SHADING_MAP_SIZE, dev->mShadingMapSize, /*data_count*/2);
+    metadataCopy.update(ANDROID_SYNC_FRAME_NUMBER, &frameNumber, /*data_count*/1);
 
     auto it = dev->mSequenceCallbackMap.find(sequenceId);
     if (it != dev->mSequenceCallbackMap.end()) {
diff --git a/camera/ndk/impl/ACameraMetadata.cpp b/camera/ndk/impl/ACameraMetadata.cpp
index 8366ade..ab99e38 100644
--- a/camera/ndk/impl/ACameraMetadata.cpp
+++ b/camera/ndk/impl/ACameraMetadata.cpp
@@ -294,7 +294,6 @@
         case ACAMERA_LENS_FOCUS_DISTANCE:
         case ACAMERA_LENS_OPTICAL_STABILIZATION_MODE:
         case ACAMERA_NOISE_REDUCTION_MODE:
-        case ACAMERA_REQUEST_ID:
         case ACAMERA_SCALER_CROP_REGION:
         case ACAMERA_SENSOR_EXPOSURE_TIME:
         case ACAMERA_SENSOR_FRAME_DURATION:
@@ -311,9 +310,7 @@
         case ACAMERA_TONEMAP_MODE:
         case ACAMERA_TONEMAP_GAMMA:
         case ACAMERA_TONEMAP_PRESET_CURVE:
-        case ACAMERA_LED_TRANSMIT:
         case ACAMERA_BLACK_LEVEL_LOCK:
-        case ACAMERA_REPROCESS_EFFECTIVE_EXPOSURE_FACTOR:
             return true;
         default:
             return false;