Merge "Update dirty-image-objects am: 4c7291f76c" into qt-dev-plus-aosp
am: 5ad41ab928

Change-Id: I8c75ce5a62eb633b436ea6ab899c8ce1bde569ff