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

Change-Id: Ieb762239ae208f3b155343cb4788ed029a986cdd