Merge "Fix CameraManagerTest."