Merge "Group dirty images objects together in the image."
am: c4bfca1dd9

Change-Id: I841cf7830f17297af01152e96dd063f8f83ce7cd