diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 1064d29..a2b6299 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -620,9 +620,6 @@
                         "] at CameraState[" + cameraState + "]";
                 Log.e(TAG, "RuntimeException during " + errorContext, ex);
 
-                // Be conservative by invalidating both CameraAgent and CameraProxy objects.
-                mCameraState.invalidate();
-
                 if (mCamera != null) {
                     Log.i(TAG, "Release camera since mCamera is not null.");
                     try {
diff --git a/camera2/portability/tests/Android.mk b/camera2/portability/tests/Android.mk
index f0b24e0..23f39e6 100644
--- a/camera2/portability/tests/Android.mk
+++ b/camera2/portability/tests/Android.mk
@@ -20,6 +20,6 @@
 LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-java-files-under,src) $(call all-java-files-under,../../utils/tests)
 LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability android-ex-camera2-utils \
-                               android-support-test mockito-target
+                               android-support-test mockito-target-minus-junit4
 
 include $(BUILD_PACKAGE)
diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
index 0b4d6c6..f360ad7 100644
--- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
+++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingSessionCallback.java
@@ -212,6 +212,14 @@
         }
     }
 
+    @Override
+    public void onCaptureQueueEmpty(CameraCaptureSession session) {
+        mSessionFuture.setSession(session);
+        if (mProxy != null) {
+            mProxy.onCaptureQueueEmpty(session);
+        }
+    }
+
     /**
      * Wait until the designated surface is prepared by the camera capture session.
      *
diff --git a/camera2/utils/tests/Android.mk b/camera2/utils/tests/Android.mk
index 6b3a569..6e81ec3 100644
--- a/camera2/utils/tests/Android.mk
+++ b/camera2/utils/tests/Android.mk
@@ -19,6 +19,6 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
 LOCAL_SRC_FILES := $(call all-java-files-under,src)
-LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-utils android-support-test mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-utils android-support-test mockito-target-minus-junit4
 
 include $(BUILD_PACKAGE)