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

Change-Id: Ie40cbf87f35fc0a486024ca1f4142821111ab43a