Update images image model

*Updated image model to account for extra image properties

Change-Id: I802fbc74caeca997be91726f0e3e068311499926
Merge "Update images image model"