Round-trip empty image attributes

Change-Id: I5167fc4ec62ba39bf71ca1d5d227dcab353fb9e0