WIP: use system_metadata image properties if present

Change-Id: Ic1d06dc4bcc31c190f3b208eb06ccde89c5d789e