Merge "Add dirty_image_objects file." into oc-mr1-dev