diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 9cf1c98410f9..7bb2560025e2 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1488,9 +1488,9 @@ void CameraDevice::requestComplete(Request *request)
 	 * It might be appropriate to return a 'correct' (as determined by
 	 * pipeline handlers) timestamp in the Request itself.
 	 */
-	FrameBuffer *buffer = buffers.begin()->second;
+	FrameBuffer *timestampBuf = buffers.begin()->second;
 	resultMetadata = getResultMetadata(descriptor->frameNumber_,
-					   buffer->metadata().timestamp);
+					   timestampBuf->metadata().timestamp);
 
 	/* Handle any JPEG compression. */
 	for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) {
@@ -1548,7 +1548,7 @@ void CameraDevice::requestComplete(Request *request)
 
 	if (status == CAMERA3_BUFFER_STATUS_OK) {
 		notifyShutter(descriptor->frameNumber_,
-			      buffer->metadata().timestamp);
+			      timestampBuf->metadata().timestamp);
 
 		captureResult.partial_result = 1;
 		captureResult.result = resultMetadata->get();