Merge "handle don't care regions in the system image"