Merge "support don't-care maps when writing the system image"