diff --git a/apps/CameraITS/pymodules/its/caps.py b/apps/CameraITS/pymodules/its/caps.py
index 06e1174..9acbb3c 100644
--- a/apps/CameraITS/pymodules/its/caps.py
+++ b/apps/CameraITS/pymodules/its/caps.py
@@ -584,6 +584,19 @@
               'android.control.afSceneChange' in props['camera.characteristics.resultKeys']
 
 
+def zoom_ratio_range(props):
+    """Returns whether a device supports zoom capabilities.
+
+    Args:
+        props: Camera properties object.
+
+    Returns:
+        Boolean.
+    """
+    return props.has_key('android.control.zoomRatioRange') and \
+           props['android.control.zoomRatioRange'] is not None
+
+
 class __UnitTest(unittest.TestCase):
     """Run a suite of unit tests on this module.
     """
diff --git a/apps/CameraITS/pymodules/its/cv2image.py b/apps/CameraITS/pymodules/its/cv2image.py
index b0a3d56..c1ccb54 100644
--- a/apps/CameraITS/pymodules/its/cv2image.py
+++ b/apps/CameraITS/pymodules/its/cv2image.py
@@ -418,5 +418,34 @@
                     abs(get_angle(wide_img)), angle, 2.0)
 
 
+def component_shape(contour):
+    """Measure the shape of a connected component.
+
+    Args:
+        contour: return from cv2.findContours. A list of pixel coordinates of
+        the contour.
+
+    Returns:
+        The most left, right, top, bottom pixel location, height, width, and
+        the center pixel location of the contour.
+    """
+    shape = {'left': numpy.inf, 'right': 0, 'top': numpy.inf, 'bottom': 0,
+             'width': 0, 'height': 0, 'ctx': 0, 'cty': 0}
+    for pt in contour:
+        if pt[0][0] < shape['left']:
+            shape['left'] = pt[0][0]
+        if pt[0][0] > shape['right']:
+            shape['right'] = pt[0][0]
+        if pt[0][1] < shape['top']:
+            shape['top'] = pt[0][1]
+        if pt[0][1] > shape['bottom']:
+            shape['bottom'] = pt[0][1]
+    shape['width'] = shape['right'] - shape['left'] + 1
+    shape['height'] = shape['bottom'] - shape['top'] + 1
+    shape['ctx'] = (shape['left'] + shape['right']) / 2
+    shape['cty'] = (shape['top'] + shape['bottom']) / 2
+    return shape
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py b/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py
index de134a7..46d1d89 100644
--- a/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py
+++ b/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py
@@ -16,6 +16,7 @@
 import os.path
 import cv2
 import its.caps
+import its.cv2image
 import its.device
 import its.image
 import its.objects
@@ -541,9 +542,9 @@
                     or len(ct) < 15):
             continue
         # Check the shapes of current component and its parent
-        child_shape = component_shape(ct)
+        child_shape = its.cv2image.component_shape(ct)
         parent = hrch[3]
-        prt_shape = component_shape(contours[parent])
+        prt_shape = its.cv2image.component_shape(contours[parent])
         prt_area = cv2.contourArea(contours[parent])
         dist_x = abs(child_shape["ctx"]-prt_shape["ctx"])
         dist_y = abs(child_shape["cty"]-prt_shape["cty"])
@@ -644,34 +645,5 @@
     return aspect_ratio, cc_ct, (circle_w, circle_h)
 
 
-def component_shape(contour):
-    """Measure the shape for a connected component in the aspect ratio test.
-
-    Args:
-        contour: return from cv2.findContours. A list of pixel coordinates of
-        the contour.
-
-    Returns:
-        The most left, right, top, bottom pixel location, height, width, and
-        the center pixel location of the contour.
-    """
-    shape = {"left": np.inf, "right": 0, "top": np.inf, "bottom": 0,
-             "width": 0, "height": 0, "ctx": 0, "cty": 0}
-    for pt in contour:
-        if pt[0][0] < shape["left"]:
-            shape["left"] = pt[0][0]
-        if pt[0][0] > shape["right"]:
-            shape["right"] = pt[0][0]
-        if pt[0][1] < shape["top"]:
-            shape["top"] = pt[0][1]
-        if pt[0][1] > shape["bottom"]:
-            shape["bottom"] = pt[0][1]
-    shape["width"] = shape["right"] - shape["left"] + 1
-    shape["height"] = shape["bottom"] - shape["top"] + 1
-    shape["ctx"] = (shape["left"]+shape["right"])/2
-    shape["cty"] = (shape["top"]+shape["bottom"])/2
-    return shape
-
-
 if __name__ == "__main__":
     main()
diff --git a/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py b/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py
index 594b0be..eda618b 100644
--- a/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py
+++ b/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py
@@ -19,6 +19,7 @@
 import cv2
 
 import its.caps
+import its.cv2image
 import its.device
 import its.image
 import its.objects
@@ -134,9 +135,9 @@
                     or len(ct) < 15):
             continue
         # Check the shapes of current component and its parent
-        child_shape = component_shape(ct)
+        child_shape = its.cv2image.component_shape(ct)
         parent = hrch[3]
-        prt_shape = component_shape(contours[parent])
+        prt_shape = its.cv2image.component_shape(contours[parent])
         prt_area = cv2.contourArea(contours[parent])
         dist_x = abs(child_shape['ctx']-prt_shape['ctx'])
         dist_y = abs(child_shape['cty']-prt_shape['cty'])
@@ -181,35 +182,6 @@
     return [circle_ctx, circle_cty, (circle_w+circle_h)/4.0]
 
 
-def component_shape(contour):
-    """Measure the shape of a connected component.
-
-    Args:
-        contour: return from cv2.findContours. A list of pixel coordinates of
-        the contour.
-
-    Returns:
-        The most left, right, top, bottom pixel location, height, width, and
-        the center pixel location of the contour.
-    """
-    shape = {'left': np.inf, 'right': 0, 'top': np.inf, 'bottom': 0,
-             'width': 0, 'height': 0, 'ctx': 0, 'cty': 0}
-    for pt in contour:
-        if pt[0][0] < shape['left']:
-            shape['left'] = pt[0][0]
-        if pt[0][0] > shape['right']:
-            shape['right'] = pt[0][0]
-        if pt[0][1] < shape['top']:
-            shape['top'] = pt[0][1]
-        if pt[0][1] > shape['bottom']:
-            shape['bottom'] = pt[0][1]
-    shape['width'] = shape['right'] - shape['left'] + 1
-    shape['height'] = shape['bottom'] - shape['top'] + 1
-    shape['ctx'] = (shape['left']+shape['right'])/2
-    shape['cty'] = (shape['top']+shape['bottom'])/2
-    return shape
-
-
 def define_reference_camera(pose_reference, cam_reference):
     """Determine the reference camera.
 
@@ -319,7 +291,7 @@
                     fmt_codes = 0x23
                     fmt_configs = [cfg for cfg in configs if cfg['format'] == fmt_codes]
 
-                out_configs = [cfg for cfg in fmt_configs if cfg['input'] is False]
+                out_configs = [cfg for cfg in fmt_configs if not cfg['input']]
                 out_sizes = [(cfg['width'], cfg['height']) for cfg in out_configs]
                 physicalSizes[physical_id] = max(out_sizes, key=lambda item: item[1])
 
diff --git a/apps/CameraITS/tests/scene6/scene6.pdf b/apps/CameraITS/tests/scene6/scene6.pdf
new file mode 100644
index 0000000..62381b5
--- /dev/null
+++ b/apps/CameraITS/tests/scene6/scene6.pdf
Binary files differ
diff --git a/apps/CameraITS/tests/scene6/scene6_0.5x_scaled.pdf b/apps/CameraITS/tests/scene6/scene6_0.5x_scaled.pdf
new file mode 100644
index 0000000..3fd1b9e
--- /dev/null
+++ b/apps/CameraITS/tests/scene6/scene6_0.5x_scaled.pdf
Binary files differ
diff --git a/apps/CameraITS/tests/scene6/scene6_0.67x_scaled.pdf b/apps/CameraITS/tests/scene6/scene6_0.67x_scaled.pdf
new file mode 100644
index 0000000..4aedccc
--- /dev/null
+++ b/apps/CameraITS/tests/scene6/scene6_0.67x_scaled.pdf
Binary files differ
diff --git a/apps/CameraITS/tests/scene6/test_zoom.py b/apps/CameraITS/tests/scene6/test_zoom.py
new file mode 100644
index 0000000..c111e1e
--- /dev/null
+++ b/apps/CameraITS/tests/scene6/test_zoom.py
@@ -0,0 +1,207 @@
+# Copyright 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import math
+import os.path
+import cv2
+
+import its.caps
+import its.cv2image
+import its.device
+import its.image
+import its.objects
+
+import numpy as np
+
+COLOR = 0  # [0: black, 255: white]
+NAME = os.path.basename(__file__).split('.')[0]
+NUM_STEPS = 10
+MIN_AREA_RATIO = 0.00015  # Based on 2000/(4000x3000) pixels
+MIN_CIRCLE_PTS = 25
+OFFSET_RTOL = 0.10
+RADIUS_RTOL = 0.10
+ZOOM_MAX_THRESH = 10.0
+ZOOM_MIN_THRESH = 2.0
+
+
+def distance(x, y):
+    return math.sqrt(x**2 + y**2)
+
+
+def circle_cropped(circle, size):
+    """Determine if a circle is cropped by edge of img.
+
+    Args:
+        circle:         list; [x, y, radius] of circle
+        size:           tuple; [x, y] size of img
+
+    Returns:
+        Boolean True if selected circle is cropped
+    """
+
+    cropped = False
+    circle_x, circle_y = circle[0], circle[1]
+    circle_r = circle[2]
+    x_min, x_max = circle_x - circle_r, circle_x + circle_r
+    y_min, y_max = circle_y - circle_r, circle_y + circle_r
+    if x_min < 0 or y_min < 0 or x_max > size[0] or y_max > size[1]:
+        cropped = True
+    return cropped
+
+
+def find_center_circle(img, name, color, min_area, debug):
+    """Find the circle closest to the center of the image.
+
+    Finds all contours in the image. Rejects those too small and not enough
+    points to qualify as a circle. The remaining contours must have center
+    point of color=color and are sorted based on distance from the center
+    of the image. The contour closest to the center of the image is returned.
+
+    Note: hierarchy is not used as the hierarchy for black circles changes
+    as the zoom level changes.
+
+    Args:
+        img:            numpy img array with pixel values in [0,255].
+        name:           str; file name
+        color:          int; 0: black, 255: white
+        min_area:       int; minimum area of circles to screen out
+        debug:          bool; save extra data
+
+    Returns:
+        circle:         [center_x, center_y, radius]
+    """
+
+    # gray scale & otsu threshold to binarize the image
+    gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
+    _, img_bw = cv2.threshold(np.uint8(gray), 0, 255,
+                              cv2.THRESH_BINARY + cv2.THRESH_OTSU)
+
+    # use OpenCV to find contours (connected components)
+    cv2_version = cv2.__version__
+    if cv2_version.startswith('2.4.'):
+        contours, _ = cv2.findContours(255-img_bw, cv2.RETR_TREE,
+                                       cv2.CHAIN_APPROX_SIMPLE)
+    elif cv2_version.startswith('3.2.'):
+        _, contours, _ = cv2.findContours(255-img_bw, cv2.RETR_TREE,
+                                          cv2.CHAIN_APPROX_SIMPLE)
+
+    # check contours and find the best circle candidates
+    circles = []
+    img_ctr = [gray.shape[1]/2, gray.shape[0]/2]
+    for contour in contours:
+        area = cv2.contourArea(contour)
+        if area > min_area and len(contour) >= MIN_CIRCLE_PTS:
+            shape = its.cv2image.component_shape(contour)
+            radius = (shape['width'] + shape['height']) / 4
+            colour = img_bw[shape['cty']][shape['ctx']]
+            circlish = round((math.pi * radius**2) / area, 4)
+            if colour == color:
+                circles.append([shape['ctx'], shape['cty'], radius, circlish,
+                                area])
+
+    if debug:
+        circles.sort(key=lambda x: abs(x[3]-1.0))  # sort for best circles
+        print 'circles [x, y, r, pi*r**2/area, area]:', circles
+    # find circle closest to center
+    circles.sort(key=lambda x: distance(x[0]-img_ctr[0], x[1]-img_ctr[1]))
+    circle = circles[0]
+
+    # add circle to saved image
+    center_i = (int(round(circle[0], 0)), int(round(circle[1], 0)))
+    radius_i = int(round(circle[2], 0))
+    cv2.circle(img, center_i, radius_i, (255, 0, 0), 5)
+    its.image.write_image(img/255.0, name)
+
+    if not circles:
+        print 'No circle was detected. Please take pictures according',
+        print 'to instruction carefully!\n'
+        assert False
+
+    return [circle[0], circle[1], circle[2]]
+
+
+def main():
+    """Test the camera zoom behavior."""
+
+    z_test_list = []
+    circle = {}
+    with its.device.ItsSession() as cam:
+        props = cam.get_camera_properties()
+        its.caps.skip_unless(its.caps.zoom_ratio_range(props))
+
+        z_range = props['android.control.zoomRatioRange']
+        print 'testing zoomRatioRange:', z_range
+        yuv_size = its.objects.get_largest_yuv_format(props)
+        size = [yuv_size['width'], yuv_size['height']]
+        debug = its.caps.debug_mode()
+
+        z_min, z_max = float(z_range[0]), float(z_range[1])
+        z_list = np.arange(z_min, z_max, float(z_max-z_min)/(NUM_STEPS-1))
+        z_list = np.append(z_list, z_max)
+        its.caps.skip_unless(z_max >= z_min*ZOOM_MIN_THRESH)
+
+        # do captures over zoom range
+        req = its.objects.auto_capture_request()
+        for i, z in enumerate(z_list):
+            print 'zoom ratio: %.2f' % z
+            req['android.control.zoomRatio'] = z
+            cap = cam.do_capture(req, cam.CAP_YUV)
+            img = its.image.convert_capture_to_rgb_image(cap, props=props)
+
+            # convert to [0, 255] images with unsigned integer
+            img *= 255
+            img = img.astype(np.uint8)
+
+            # Find the circles in img
+            circle[i] = find_center_circle(
+                    img, '%s_%s.jpg' % (NAME, round(z, 2)), COLOR,
+                    min_area=MIN_AREA_RATIO*size[0]*size[1]*z*z, debug=debug)
+            if circle_cropped(circle[i], size):
+                print 'zoom %.2f is too large! Skip further captures' % z
+                break
+            z_test_list.append(z)
+
+    # assert some range is tested before circles get too big
+    zoom_max_thresh = ZOOM_MAX_THRESH
+    if z_max < ZOOM_MAX_THRESH:
+        zoom_max_thresh = z_max
+    msg = 'Max zoom level tested: %d, THRESH: %d' % (
+            z_test_list[-1], zoom_max_thresh)
+    assert z_test_list[-1] >= zoom_max_thresh, msg
+
+    # print 'circles:', circle
+    radius_init = float(circle[0][2])
+    offset_init = [circle[0][0]-size[0]/2,
+                   circle[0][1]-size[1]/2]
+    z_init = float(z_test_list[0])
+    for i, z in enumerate(z_test_list):
+        print '\nZoom: %.2f' % z
+        offset_x_abs = (circle[i][0] - size[0] / 2)
+        offset_y_abs = (circle[i][1] - size[1] / 2)
+        print 'Circle r: %.1f, center offset x, y: %d, %d' % (
+                circle[i][2], offset_x_abs, offset_y_abs)
+        z_ratio = z/z_init
+        radius_ratio = circle[i][2]/radius_init
+        msg = 'zoom: %.2f, radius ratio: %.2f, RTOL: %.2f' % (
+                z_ratio, radius_ratio, RADIUS_RTOL)
+        assert np.isclose(z_ratio, radius_ratio, rtol=RADIUS_RTOL), msg
+        offset_rel = (distance(offset_x_abs, offset_y_abs) / radius_ratio /
+                      distance(offset_init[0], offset_init[1]))
+        msg = 'zoom: %.2f, offset(rel): %.2f, RTOL: %.2f' % (
+                z, offset_rel, OFFSET_RTOL)
+        assert np.isclose(offset_rel, 1.0, rtol=OFFSET_RTOL), msg
+
+
+if __name__ == '__main__':
+    main()
diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index 83177f2..c3784fe 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -56,7 +56,7 @@
 #   scene*_a/b/... are similar scenes that share one or more tests
 ALL_SCENES = ['scene0', 'scene1_1', 'scene1_2', 'scene2_a', 'scene2_b',
               'scene2_c', 'scene2_d', 'scene2_e', 'scene3', 'scene4',
-              'scene5', 'sensor_fusion', 'scene_change']
+              'scene5', 'scene6', 'sensor_fusion', 'scene_change']
 
 # Scenes that are logically grouped and can be called as group
 GROUPED_SCENES = {
@@ -67,7 +67,7 @@
 # Scenes that can be automated through tablet display
 AUTO_SCENES = ['scene0', 'scene1_1', 'scene1_2', 'scene2_a', 'scene2_b',
                'scene2_c', 'scene2_d', 'scene2_e', 'scene3', 'scene4',
-               'scene_change']
+               'scene6', 'scene_change']
 
 SCENE_REQ = {
         'scene0': None,
@@ -84,6 +84,8 @@
                   'for more details',
         'scene5': 'Capture images with a diffuser attached to the camera. See '
                   'CameraITS.pdf section 2.3.4 for more details',
+        'scene6': 'A specific test page of a grid of 9x5 circles circle '
+                  'middle 50% of the scene.',
         'sensor_fusion': 'Rotating checkboard pattern. See '
                          'sensor_fusion/SensorFusion.pdf for detailed '
                          'instructions.\nNote that this test will be skipped '
@@ -121,6 +123,9 @@
         'scene3': [],
         'scene4': [],
         'scene5': [],
+        'scene6': [
+                ['test_zoom', 30]
+        ],
         'sensor_fusion': [],
         'scene_change': [
                 ['test_scene_change', 31]
@@ -158,6 +163,7 @@
                 'test_aspect_ratio_and_crop'
         ],
         'scene5': [],
+        'scene6': [],
         'sensor_fusion': [
                 'test_sensor_fusion'
         ],
@@ -187,6 +193,7 @@
         'scene3': [],
         'scene4': [],
         'scene5': [],
+        'scene6': [],
         'sensor_fusion': [],
         'scene_change': []
 }