Merge "Null initialize dirty_image_objects_filename_" am: 543d613bff
am: c7d05dc221

Change-Id: I9a597d9d6f005edde33ce645e6d1fb627dcdcc8d