diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index d667c4f126f3..fa4570fabdd7 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -377,7 +377,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()
 	 * Currently: 50 entries, 647 bytes of static metadata
 	 */
 	uint32_t numEntries = 50;
-	uint32_t byteSize = 667;
+	uint32_t byteSize = 671;
 
 	/*
 	 * Calculate space occupation in bytes for dynamically built metadata
@@ -438,6 +438,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 
 	std::vector<uint8_t> aeAvailableModes = {
 		ANDROID_CONTROL_AE_MODE_ON,
+		ANDROID_CONTROL_AE_MODE_OFF,
 	};
 	staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_MODES,
 				  aeAvailableModes.data(),
@@ -464,6 +465,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 				  aeCompensationStep, 1);
 
 	std::vector<uint8_t> availableAfModes = {
+		ANDROID_CONTROL_AF_MODE_AUTO,
 		ANDROID_CONTROL_AF_MODE_OFF,
 	};
 	staticMetadata_->addEntry(ANDROID_CONTROL_AF_AVAILABLE_MODES,
@@ -492,6 +494,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 				  availableStabilizationModes.size());
 
 	std::vector<uint8_t> availableAwbModes = {
+		ANDROID_CONTROL_AWB_MODE_AUTO,
 		ANDROID_CONTROL_AWB_MODE_OFF,
 	};
 	staticMetadata_->addEntry(ANDROID_CONTROL_AWB_AVAILABLE_MODES,
@@ -522,9 +525,13 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 	staticMetadata_->addEntry(ANDROID_CONTROL_AWB_LOCK_AVAILABLE,
 				  &awbLockAvailable, 1);
 
-	char availableControlModes = ANDROID_CONTROL_MODE_AUTO;
+	std::vector<uint8_t> availableControlModes = {
+		ANDROID_CONTROL_MODE_AUTO,
+		ANDROID_CONTROL_MODE_OFF,
+	};
 	staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_MODES,
-				  &availableControlModes, 1);
+				  availableControlModes.data(),
+				  availableControlModes.size());
 
 	/* JPEG static metadata. */
 	std::vector<int32_t> availableThumbnailSizes = {