Merge "Change dirty-image-objects file format."