Merge "Add dirty_image_objects file." am: 935e0c996a am: 7dce8cbdeb am: 2c7efb994b
am: 4fe58637b3

Change-Id: I1e40da6a1f9f4649a96cdab4869856e50cfca350